From: Jyrki Gadinger Date: Mon, 24 Mar 2025 08:50:21 +0000 (+0100) Subject: fix Windows build X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2^2~71^2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=8502777f551b40d11c19723045cd72dc6ca27956;p=nextcloud-desktop.git fix Windows build `cl` didn't quite like it: ``` error C2445: result type of conditional expression is ambiguous: types 'QByteArray' and 'const char [1]' can be converted to multiple common types ``` just changing the `auto` to `QByteArray` results in the same compile error Signed-off-by: Jyrki Gadinger --- diff --git a/src/libsync/bulkpropagatorjob.cpp b/src/libsync/bulkpropagatorjob.cpp index d2989425a..637e46c9a 100644 --- a/src/libsync/bulkpropagatorjob.cpp +++ b/src/libsync/bulkpropagatorjob.cpp @@ -268,7 +268,7 @@ void BulkPropagatorJob::slotComputeTransmissionChecksum(SyncFileItemPtr item, { // Compute the transmission checksum. const auto computeChecksum = new ComputeChecksum(this); - const auto checksumType = uploadChecksumEnabled() ? propagator()->account()->capabilities().preferredUploadChecksumType() : ""; + const auto checksumType = uploadChecksumEnabled() ? propagator()->account()->capabilities().preferredUploadChecksumType() : QByteArray{""}; computeChecksum->setChecksumType(checksumType); connect(computeChecksum, &ComputeChecksum::done, this, [this, item, fileToUpload] (const QByteArray &contentChecksumType, const QByteArray &contentChecksum) {